Don't assume that a path of depth 0 has no indices. (#467324, Szilard

2007-09-09  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_rows_reordered):
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered): Don't
        assume that a path of depth 0 has no indices.  (#467324, Szilard
        Pfeiffer)

svn path=/trunk/; revision=18770

diff --git a/ChangeLog b/ChangeLog
index defe6f225941930e53ed0f4f348607875e3ebed2..44bf579b6d336b27f3a2e6c22d637d9c927dae79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_rows_reordered):
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered): Don't
+       assume that a path of depth 0 has no indices.  (#467324, Szilard
+       Pfeiffer)
+
 2007-09-09 18:22:28  Tim Janik  <timj@gtk.org>
 
        * gdk/x11/gdkgeometry-x11.c (_gdk_window_process_expose): fix invalid

diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index 9d2b89587c52d5b9dc1018d0f8508559359c2c81..acf5d5b8144e2a8e3364cde84125290824fc3971 100644 (file)
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -1864,7 +1864,7 @@ gtk_tree_model_filter_rows_reordered (GtkTreeModel *c_model,
 
   g_return_if_fail (new_order != NULL);
 
-  if (c_path == NULL || gtk_tree_path_get_indices (c_path) == NULL)
+  if (c_path == NULL || gtk_tree_path_get_depth (c_path) == 0)
     {
       length = gtk_tree_model_iter_n_children (c_model, NULL);
 

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index f0d6e0467b2c990c8c6f43bc68b129feedf14cbb..9cdfb65c715ac2ec538a0f1f9584cf5100756605 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -807,7 +807,7 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
 
   g_return_if_fail (new_order != NULL);
 
-  if (s_path == NULL || gtk_tree_path_get_indices (s_path) == NULL)
+  if (s_path == NULL || gtk_tree_path_get_depth (s_path) = 0)
     {
       if (tree_model_sort->root == NULL)
        return;